From 3923c6638e50c51781fb5f6f29729c71336eb95a Mon Sep 17 00:00:00 2001 From: "chris@kneesaa.uk.xensource.com" Date: Mon, 7 Aug 2006 11:59:31 +0100 Subject: [PATCH] [xend] Fix reboot for hvm domains with cdrom devices. The device-type was not added to the device details which caused cdrom devices to appear as harddisks after a reboot. From: Alex Brett Signed-off-by: Christian Limpach --- tools/python/xen/xend/server/DevController.py | 2 ++ tools/python/xen/xend/server/blkif.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/tools/python/xen/xend/server/DevController.py b/tools/python/xen/xend/server/DevController.py index 42adfd987a..80d7e85dd2 100644 --- a/tools/python/xen/xend/server/DevController.py +++ b/tools/python/xen/xend/server/DevController.py @@ -341,6 +341,8 @@ class DevController: else: raise VmError("Device %s not connected" % devid) + def readFrontend(self, devid, *args): + return xstransact.Read(self.frontendPath(devid), *args) def deviceIDs(self, transaction = None): """@return The IDs of each of the devices currently configured for diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index d131ea7843..0039900eaa 100644 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -86,6 +86,9 @@ class BlkifController(DevController): 'mode') if dev: + (dev_type) = self.readFrontend(devid, 'device-type') + if dev_type: + dev += ":" + dev_type result.append(['dev', dev]) if typ and params: result.append(['uname', typ + ":" + params]) -- 2.30.2